Skip to content

Remove some unused code #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvo5 merged 2 commits into from
Feb 28, 2026
Merged

Remove some unused code #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da60b3b
Remove dead code
andy128k Feb 28, 2026
456784b
Add missing return statement
andy128k Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/rpackagefilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@ bool RFilePackageFilter::addFile(string file)
pkgs.insert(pkgs.begin(), string(str));
}
in.close();
return true;
Copy link
Owner

@mvo5 mvo5 Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

}

bool RFilePackageFilter::filter(RPackage *pkg)
Expand Down
8 changes: 2 additions & 6 deletions gtk/rgdebinstallprogress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ RGDebInstallProgress::RGDebInstallProgress(RGMainWindow *main,
RPackageLister *lister)

: RInstallProgress(), RGGtkBuilderWindow(main, "rgdebinstall_progress"),
_totalActions(0), _progress(0), _sock(0), _userDialog(0)
_totalActions(0), _progress(0), _userDialog(0)

{
// timeout in sec until the expander is expanded
Expand Down Expand Up @@ -795,11 +795,7 @@ void RGDebInstallProgress::finishUpdate()
_config->Set("Synaptic::closeZvt", autoClose ? "true" : "false");

// hide and finish
if(_sock != NULL) {
gtk_widget_destroy(_sock);
} else {
hide();
}
hide();
}

void RGDebInstallProgress::prepare(RPackageLister *lister)
Expand Down
3 changes: 0 additions & 3 deletions gtk/rgdebinstallprogress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ class RGDebInstallProgress:public RInstallProgress, public RGGtkBuilderWindow

GtkWidget *_popupMenu; // Popup menu of the terminal

// if we run embedded
GtkWidget *_sock;

bool _startCounting;

RGUserDialog *_userDialog;
Expand Down
11 changes: 2 additions & 9 deletions gtk/rgfetchprogress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bool RGFetchProgress::close()
}

RGFetchProgress::RGFetchProgress(RGWindow *win)
: RGGtkBuilderWindow(win, "fetch"), _cursorDirty(false), _sock(NULL)
: RGGtkBuilderWindow(win, "fetch"), _cursorDirty(false)
{
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
Expand Down Expand Up @@ -126,9 +126,6 @@ RGFetchProgress::RGFetchProgress(RGWindow *win)
"clicked",
G_CALLBACK(stopDownload), this);

PangoContext *context = gdk_pango_context_get();
_layout = pango_layout_new(context);

gtk_widget_realize(_win);

// reset the urgency hint here (gtk seems to like showing it for
Expand Down Expand Up @@ -369,11 +366,7 @@ void RGFetchProgress::Stop()
{
//cout << "RGFetchProgress::Stop()" << endl;
RGFlushInterface();
if(_sock != NULL) {
gtk_widget_destroy(_sock);
} else {
hide();
}
hide();
pkgAcquireStatus::Stop();

//FIXME: this needs to be handled in a better way (gtk-2 maybe?)
Expand Down
3 changes: 0 additions & 3 deletions gtk/rgfetchprogress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ class RGFetchProgress : public pkgAcquireStatus, public RGGtkBuilderWindow {

GtkWidget *_mainProgressBar; // GtkProgressBar

GtkWidget *_sock;

PangoLayout *_layout;
GtkTreeViewColumn *_statusColumn;
GtkCellRenderer *_statusRenderer;
bool _cancelled;
Expand Down
21 changes: 2 additions & 19 deletions gtk/rgterminstallprogress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ using namespace std;


RGTermInstallProgress::RGTermInstallProgress(RGMainWindow *main)
: RInstallProgress(), RGGtkBuilderWindow(main, "zvtinstallprogress"), _sock(NULL)
: RInstallProgress(), RGGtkBuilderWindow(main, "zvtinstallprogress")
{
setTitle(_("Applying Changes"));

Expand Down Expand Up @@ -173,11 +173,7 @@ void RGTermInstallProgress::stopShell(GtkWidget *self, void* data)
}

RGFlushInterface();
if(me->_sock != NULL) {
gtk_widget_destroy(me->_sock);
} else {
me->hide();
}
me->hide();
}

bool RGTermInstallProgress::close()
Expand All @@ -186,19 +182,6 @@ bool RGTermInstallProgress::close()
return true;
}

gboolean RGTermInstallProgress::zvtFocus (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
//cout << "zvtFocus" << endl;

gtk_widget_grab_focus(widget);

return FALSE;
}




pkgPackageManager::OrderResult
RGTermInstallProgress::start(pkgPackageManager *pm,
Expand Down
2 changes: 0 additions & 2 deletions gtk/rgterminstallprogress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ class RGTermInstallProgress : public RInstallProgress, public RGGtkBuilderWindow
GtkWidget *_statusL;
GtkWidget *_closeB;
GtkWidget *_closeOnF;
GtkWidget *_sock;

pkgPackageManager::OrderResult res;
static gboolean zvtFocus (GtkWidget *widget, GdkEventButton *event, gpointer user_data);

protected:
bool child_has_exited;
Expand Down